Merge pull request #1 from kbalog/master

Merge from master