Merge branch 'ReturnFix'
Merge pull request #2 from JHaun/FirstFixes

Merge branch 'ReturnFix'