Merge pull request #21 from PCatinean/revert-20-master

Revert "Merge pull request #16 from PCatinean/update"