Merge pull request #1 from jducoeur/master

Update to Justin's latest
replacing atlantian with variable
Merge pull request #4 from arbradley/master

test 1