Fixed minor merge bugs
Merge pull request #26 from malucky/dev

Fixed minor merge bugs