Merge pull request #16 from SlrG/master

Cleanup and some extensions