Merge pull request #36 from jimrybarski/master

fix dev