Merge pull request #1 from Seane235/master

?