Merge pull request #11 from Coms362/master

Final Stuff
Final, everything is working
Merge pull request #45 from rdincher/master

Final, Everything is working