seankross Merge pull request #21 from jhudsl/dev