added suggestions by Anatoliy in pull request #1