Buggy buggyyyy
Merge pull request #16 from kodify/bugyman

Bug fixing and 1.9.3 compatibility