Merge pull request #6 from rhiwri/master

syncing develop
Merge pull request #7 from rhiwri/develop

Merge pull request #6 from rhiwri/master