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

Fixes