Issue fixes

#8
#9
#11