Updated handling of implemented issues
Removed unnecessary code
Merge pull request #42 from ciuliot/issue/38

Issue/38