Merge pull request #5 from kumabotz/develop

Merge pull request #4 from kumabotz/master