finally fixed #27
Merge pull request #46 from franzose/2.0

finally fixed #27