[issue #76] [DONE] Task complete