Address issues pointed out in issues #9 and #8
0.0.9