Fixes mistakes while rebasing
Merge pull request #17 from folieadrien/fixes-rebasing-mistakes

Fixes mistakes while rebasing