multiple bug fixes and additions
Merge pull request #100 from deadanon/master

multiple bug fixes and additions