Fixes
Merge pull request #35 from TheRyanHowell/feature/Dev

Fixes