fixes #55
fixes # 54
fixes #54
Merge pull request #64 from mmmelissa/master

.