Merge pull request #20 from raphinesse/cleanup-2