issue #108 - Small fixes from pull request.