resolves #6
Merge branch 'master' into dev
removing the unnecesary implementation