Merge pull request #48 from mbiokyle29/fixes

Fixes Round Dos
Merge branch 'master' of https://github.com/MaritalWheat/homebase into fixes