diff --git a/.gitignore b/.gitignore
index 84229f4..795e8ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,6 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+# PyCharm
+.idea/
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index c6cc8c8..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5e6dbdd..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="MarkdownNavigator.ProfileManager" plain-text-search-scope="Project Files" />
-  <component name="MarkdownProjectSettings" wasCopied="true">
-    <PreviewSettings splitEditorLayout="FIRST" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="0" emojiImages="0">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="false" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="true" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="true" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="ADMONITION_EXT" value="false" />
-        <option name="ATTRIBUTES_EXT" value="false" />
-        <option name="COMMONMARK_LISTS" value="false" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="GITLAB_EXT" value="false" />
-        <option name="GITLAB_MATH_EXT" value="false" />
-        <option name="GITLAB_MERMAID_EXT" value="false" />
-        <option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
-        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="MACROS_EXT" value="false" />
-        <option name="NO_TEXT_ATTRIBUTES" value="false" />
-        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
-        <option name="PLANTUML_FENCED_CODE" value="false" />
-        <option name="PUML_FENCED_CODE" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="false" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="false" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0" mathConversion="-1">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-      <cssUriHistory />
-    </CssSettings>
-    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
-    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.0 (/usr/local/Cellar/python3/3.5.0/Frameworks/Python.framework/Versions/3.5/bin/python3.5)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index fa14b78..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pyevr.iml" filepath="$PROJECT_DIR$/.idea/pyevr.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/pyevr.iml b/.idea/pyevr.iml
deleted file mode 100644
index 6711606..0000000
--- a/.idea/pyevr.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index b703845..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1680" />
-    <option name="y" value="27" />
-    <option name="width" value="1909" />
-    <option name="height" value="1054" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="fileTemplates" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index f3d881a..d54d104 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,16 @@ python:
   - 2.7
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: pip install -U tox-travis
+install:
+  - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then pip install -r requirements_dev.txt; fi
+  - pip install -U tox-travis flake8 coveralls
 
 # Command to run tests, e.g. python setup.py test
-script: tox
+script:
+  - make lint
+  - make test-all
+  - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then coverage run --source pyevr -m pytest; fi
+  - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then coveralls; fi
 
 # Assuming you have installed the travis-ci CLI tool, after you
 # create the Github repo and add it to Travis, run the
@@ -23,7 +29,7 @@ deploy:
   distributions: sdist bdist_wheel
   user: thorgate
   password:
-    secure: PLEASE_REPLACE_ME
+    secure: AxfqY940GesaqOB8UsR8rMxIOajZ9HTCD5c/ijAynluUN9vVlmokTil2EHy+sl+48gyh3PaUI4Bj+kPxKg+NehzF/zcDQvabxYrN3dvt1UO722/42N86FvBqvBfzNiXQCPBE1+53VHLSDil3Li7pPYa+AfB7WR0fEAJPoeqOTV47ca7czUJn7cXgF3VRmIHpkbErk8veeXr0Ccn7W0BvfIGhGSKnxFZa3AHHJhsf3j0OBMoxsm+acpuXP+F9OPJYEgCk0OtBqX/C94+QGg1QdPlv8XjThQi6s0BbgxNQcQMwoWDN+CW2tf4zBnoZqPJ3jowlr/MLt6PV+4Q+Fp2KpvNoQz0I9zUbfLGYBE3QO2rjgRwKL0cr0cWcpnw23yoQmPESplx9EHNfdEM8YFYCoB4/iIuuoP27IRJEAyASZp9QLIfjPuBibhbtvmNRpJqCK7dPbDW3rp4ZMIncFiJUV4y4qnjAYIyWBMsh2+uXfGslHABI8LFiZauegfJVeA6ABMwnofwxxKTp9Y1VnNTRPouNg/ouo5k0sSIA3S3uDbHOTXJ6dzByMsK1RFVPu8XR65knCbita2Ok1qzjkNLufRxKF38YkPSQ4fIIO3YLelsTPwBXkniTGbvUSILD9LnF/+4il+hr4bx+9pbnYNaUXxxqi4G0lXrOae5P+XsSISc=
   on:
     tags: true
     repo: thorgate/pyevr
diff --git a/AUTHORS.rst b/AUTHORS.rst
index fd291c0..60e24e2 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -10,4 +10,4 @@ Development Lead
 Contributors
 ------------
 
-None yet. Why not be the first?
+* Taavi Teska <taavi@thorgate.eu>
diff --git a/README.rst b/README.rst
index 8c5e713..55771fc 100644
--- a/README.rst
+++ b/README.rst
@@ -6,17 +6,20 @@ pyevr
 .. image:: https://img.shields.io/pypi/v/pyevr.svg
         :target: https://pypi.python.org/pypi/pyevr
 
-.. image:: https://img.shields.io/travis/thorgate/pyevr.svg
+.. image:: https://travis-ci.org/thorgate/pyevr.svg?branch=master
         :target: https://travis-ci.org/thorgate/pyevr
 
 .. image:: https://readthedocs.org/projects/pyevr/badge/?version=latest
         :target: https://pyevr.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
-
 .. image:: https://pyup.io/repos/github/thorgate/pyevr/shield.svg
-     :target: https://pyup.io/repos/github/thorgate/pyevr/
-     :alt: Updates
+        :target: https://pyup.io/repos/github/thorgate/pyevr/
+        :alt: Updates
+
+.. image:: https://coveralls.io/repos/github/thorgate/pyevr/badge.svg?branch=master
+        :target: https://coveralls.io/github/thorgate/pyevr?branch=master
+        :alt: Test coverage
 
 
 
diff --git a/setup.py b/setup.py
index 01f4d47..0575e57 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,8 @@
 
 from setuptools import setup, find_packages
 
+import pyevr
+
 with open('README.rst') as readme_file:
     readme = readme_file.read()
 
@@ -18,8 +20,8 @@
 test_requirements = ['pytest>=3', ]
 
 setup(
-    author="Thorgate",
-    author_email='code@thorgate.eu',
+    author=pyevr.__author__,
+    author_email=pyevr.__email__,
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
@@ -51,6 +53,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/thorgate/pyevr',
-    version='0.1.0',
+    version=pyevr.__version__,
     zip_safe=False,
 )
diff --git a/tests/test_pyevr.py b/tests/test_pyevr.py
index 40a6f8a..1f2e31e 100644
--- a/tests/test_pyevr.py
+++ b/tests/test_pyevr.py
@@ -7,7 +7,6 @@
 
 from click.testing import CliRunner
 
-from pyevr import pyevr
 from pyevr import cli