Merge pull request #9 from aequasi/master

s
Merge pull request #10 from aequasi/develop

Merge pull request #9 from aequasi/master