Merge pull request #3 from piqus/0.2-wip

Merge with 0.2-wip
Merge pull request #4 from piqus/0.2-wip

Merge
Merge pull request #5 from piqus/master

Merging with Master