Merge pull request #1 from DNDJava/master

back down
Merge pull request #6 from barrypevans/master

Merge pull request #1 from DNDJava/master