Merge pull request #4 from Planetaryn/master

Update