I had some rebase fail
Merge pull request #97 from mhaskel/rebase_fail

I had some rebase fail