Cleaning up
Merge pull request #14 from TheRyanHowell/feature/Dev

Cleaning up