Fixed #11, fixed #15
Fixed #7