fixed merge conflicts
Merge pull request #103 from paranoidmarv/master

fixed merge conflicts