Rebased with latest master changes
Merge pull request #3 from mlara/master

Rebased with latest master changes