Merge branch 'release/0.3.1' into develop
New version 0.4.0 uses scala 2.11
Merge branch 'release/0.4.0'