Merge pull request #3 from rzjfr/develop

Develop
Merge pull request #5 from rzjfr/develop

Develop
Merge pull request #6 from rzjfr/master

?