Fixes #488 Once again, it'll be easier to look at the commits one at a time.
:thumbsup: LGTM
Pull-Request has been merged by abompard
Fixes #488
Once again, it'll be easier to look at the commits one at a time.