Merge pull request #19 from viperchris3/work

Bunch of changes