Another fix attempt
Merge pull request #5 from JHaun/FirstFixes

Another fix attempt