Merge pull request #7 from piqus/master

Merge pull request #6 from piqus/stable
Merge pull request #8 from piqus/develop

Develop
Merge pull request #9 from piqus/stable

Merge