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

Fixes