Merge pull request #1 from mar10/master

Merge from mar10:master