ref #2 : resolved some simple issues mentioned in comments on the pull request