Merge pull request #36 from jimrybarski/master

fix dev
Merge pull request #37 from jimrybarski/dev

Merge pull request #36 from jimrybarski/master