Gankro Merge pull request #11 from apasel422/wip

Additional cleanup

Latest commit 8c1931c

Feb 6, 2016