Merge pull request #65 from zorro1rr/justins_branch