Minor update (Issues 8 and 10)

Not sure if 10 is fixed though