Merge pull request #7 from flashii/master

Updating my branch