Merge pull request #12 from mpetris/master

latest features and bugfixes
Merge pull request #13 from mpetris/master

latest features and bugfixes