Update
Merge pull request #2 from AstonJ/master

Slight update