Merge pull request #6 from piqus/stable

Merge pull request #5 from piqus/master
Merge pull request #7 from piqus/master

Merge pull request #6 from piqus/stable