Fixes issues 28-34
Merge pull request #36 from alexkahn/master

Fixes issues 28-34