Fixed rebasing errors
Rebase fix branch
Merge pull request #7 from neillobo/rebase/fix

Rebase/fix for rebasing errors