stereofuture Merge pull request #14 from stereofuture/cleanup