Cleanup
More cleanup
Merge pull request #6 from Nebulai/master

Author cleanup of shapredetector