Clean-ups
Merge pull request #144 from ussuri/master

Clean-ups