Merge pull request #25 from quarterto/develop

srnt
Merge pull request #26 from quarterto/master

Merge pull request #25 from quarterto/develop