Merge pull request #20 from PCatinean/master

Merge pull request #16 from PCatinean/update
Revert "Merge pull request #16 from PCatinean/update"
Merge pull request #22 from PCatinean/revert-20-master

Revert 20 master