closes #65, closes #23, closes #57, closes#51
Merge pull request #69 from changer/hotfixes

closes #65, closes #23, closes #57, closes #51