Update for Jorah
Merge pull request #2 from bradwilson/master

Update for Jorah