Bug fixing

-
Merge pull request #61 from mentatzoe/master

Bug fixing