Two changes
Merge pull request #3 from crunkyedwards/master

Bug fixes