Merge pull request #6 from rzjfr/master

?
Merge pull request #7 from rzjfr/develop

Merge pull request #6 from rzjfr/master