Possible fix for issues #63 and #64
merged with pull request fixes