fix conflicts
Merge pull request #43 from raderj89/master

fix conflicts