Merge pull request #2 from jducoeur/master

Get current updates
todays work
Merge pull request #9 from arbradley/master

today's work