Fixed a issue with rebase
Merge pull request #7 from MadsNielsen/master

Fixed a issue with rebase