Fixed #4
Fixed #5
Merge branch 'master' of github.com:spearal/spearal-java