fixed resolution calc bug
change default resolution to 2
add proxied timeout
Merge branch 'dev' into version
0.1.46