Some hotfixes
Merge pull request #3 from joegreen88/master

Some hotfixes