Merge pull request #11 from piqus/master

Stable