Merge branch 'master' of https://github.com/dieselpoint/norm.git

README.md

@@ -239,7 +239,7 @@ Here's the Maven dependency:
 <dependency>
     <groupId>com.dieselpoint</groupId>
     <artifactId>norm</artifactId>
-    <version>0.8.5</version>
+    <version>1.0.5</version>
 </dependency>
 ```  
 

src/main/java/com/dieselpoint/norm/sqlmakers/StandardPojoInfo.java

@@ -9,6 +9,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -297,6 +298,12 @@ public void putValue(Object pojo, String name, Object value, boolean ignoreIfMis
 
 		if (prop.writeMethod != null) {
 			try {
+				if (value instanceof BigInteger && prop.writeMethod.getParameterCount() >= 1) {
+					Class type = prop.writeMethod.getParameterTypes()[0];
+					if (type.equals(Long.TYPE) || type.equals(Long.class)) {
+						value = ((BigInteger) value).longValue();
+					}
+				}
 				prop.writeMethod.invoke(pojo, value);
 			} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 				throw new DbException("Could not write value into pojo. Property: " + prop.name + " method: "
@@ -308,6 +315,11 @@ public void putValue(Object pojo, String name, Object value, boolean ignoreIfMis
 
 		if (prop.field != null) {
 			try {
+				if (value instanceof BigInteger) {
+					if (prop.field.getType().equals(Long.TYPE) || prop.field.getType().equals(Long.class)) {
+						value = ((BigInteger) value).longValue();
+					}
+				}
 				prop.field.set(pojo, value);
 			} catch (IllegalArgumentException | IllegalAccessException e) {
 				throw new DbException(