Merge pull request #72 from quandrum/clean-merge

Clean merge