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

Fixes mistakes while rebasing