Fix bugs
Merge pull request #1 from alexpjohnson/master

Fix bugs