Merge pull request #4 from mpetris/master

latest features and bugfixes
Merge remote-tracking branch 'mpetris/master'