Issue #46 , rewrote my task on a clean branch from master