Fixes: #9
rebased onto e9714f2343a671694f3a38e1e04044c43ffcde89
Pull-Request has been merged by abompard
Fixes: #9