Removed part with mistake
Added more stuff that cope with issue #53
Finished issu #53
Merge branch 'iss53'