Fixes for pull request  #18 comments