Merge pull request #4 from PCatinean/update

New pull request
Merge pull request #18 from PCatinean/master

Merge pull request #4 from PCatinean/update