Update
Merge pull request #6 from nickgrace/master

Update