Iss49 resolved

Issue #49 resolved. Update master branch.