Merge pull request #34 from kane3/master

Delete unused code and feature request