Revert "Commit in scope of issue :  Issue #104 "

This reverts commit 28cfe8747997325b82cc7ba039a68d61e6aa311c.