Merge pull request #5 from piqus/master

Merging with Master