Bugfixes
Merge pull request #12 from dshanske/master

Bugfixes