Clean-up
Merge pull request #24 from AlexanderDzhoganov/master

Clean-up