Fixed #12
Fixed #11