resolving rebase issues
Merge pull request #9 from binaryberry/master

resolving rebase issues