Polishing, update dependencies, cleanup
Merge pull request #8 from ghillert/issues-7

Polishing, update dependencies, cleanup