Tested and fixed bugs
Merge branch 'master' of github.com:maverick97/shelldon