Merge pull request #7 from Aurorastation/master

Update