Merge pull request #1 from Seane235/master

?
Merge pull request #3 from PLopezD/master

Merge pull request #1 from Seane235/master