diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws

diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a11c4aa..5c37047 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" group="simple-database-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" group="simple-database-kotlin" />
     </modules>
   </component>
 </project>
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a11c4aa..5c37047 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" group="simple-database-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" group="simple-database-kotlin" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml
index d749fb4..8a17bfb 100644
--- a/.idea/modules/simple-database-kotlin.iml
+++ b/.idea/modules/simple-database-kotlin.iml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.5-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a11c4aa..5c37047 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" group="simple-database-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" group="simple-database-kotlin" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml
index d749fb4..8a17bfb 100644
--- a/.idea/modules/simple-database-kotlin.iml
+++ b/.idea/modules/simple-database-kotlin.iml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.5-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..27d08f8
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database-kotlin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a11c4aa..5c37047 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" group="simple-database-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" group="simple-database-kotlin" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml
index d749fb4..8a17bfb 100644
--- a/.idea/modules/simple-database-kotlin.iml
+++ b/.idea/modules/simple-database-kotlin.iml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.5-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..27d08f8
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database-kotlin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..80d2d9c
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database-kotlin:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple-database-kotlin_main" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-database-kotlin_main" />
+</module>
\ No newline at end of file

diff --git a/.gitignore b/.gitignore
index aeeb256..742c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 local.properties
 gradle.properties
+
+.gradle
+build
+simple-database-kotlin.iws
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a11c4aa..5c37047 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_main.iml" group="simple-database-kotlin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/simple-database-kotlin_test.iml" group="simple-database-kotlin" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml
index d749fb4..8a17bfb 100644
--- a/.idea/modules/simple-database-kotlin.iml
+++ b/.idea/modules/simple-database-kotlin.iml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.5-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build" />
-    <output-test url="file://$MODULE_DIR$/../../build" />
+<module external.linked.project.id="simple-database-kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..27d08f8
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database-kotlin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <content url="file://$MODULE_DIR$/../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..80d2d9c
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="simple-database-kotlin:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="nl.astraeus.database" external.system.module.type="sourceSet" external.system.module.version="1.2.8-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <content url="file://$MODULE_DIR$/../../src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="simple-database-kotlin_main" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Gradle: nl.astraeus.template:very-simple-templates:1.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: com.h2database:h2:1.4.192" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="simple-database-kotlin_main" />
+</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6c50bb0..fb5fbde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@
 apply plugin: 'maven'
 apply plugin: 'findbugs'
 apply plugin: 'maven-publish'
+apply plugin: 'net.researchgate.release'
 
 sourceSets {
     main.java.srcDirs += 'src'
@@ -24,9 +25,13 @@
         maven {
             url "http://nexus.astraeus.nl/nexus/content/groups/public"
         }
+        maven {
+            url 'https://plugins.gradle.org/m2/'
+        }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'net.researchgate:gradle-release:2.4.0'
     }
 }