Merge pull request #11 from piqus/master

Stable
Merge pull request #12 from piqus/stable

Merge pull request #11 from piqus/master