Merge pull request #5 from piqus/master

Merging with Master
Merge pull request #6 from piqus/stable

Merge pull request #5 from piqus/master