Bug fixing

-
Merge pull request #61 from mentatzoe/master

Bug fixing
Merge pull request #20 from JohnMai/master

Fix 2.0