Bug fix on first startup
Merge pull request #83 from aphillips915/master

Bug fix on first startup