Merge pull request #119 from franzose/master

sync with master
fixed #115 and added some spaces
Merge pull request #120 from franzose/3.x

fixed #115