WIP #4
Mentions issue #4
added 1 commit
Compare with previous version
@franchi please checkout this version and merge if you think is ok.