fixes infufg/sade#70 infufg/sade#71 infufg/sade#72
Merge pull request #74 from blessedguy/master

fixes infufg/sade#70 infufg/sade#71 infufg/sade#72