Merge pull request #2 from mlara/master

Rebased with latest master changes