Fixed #3 and #2.
Version tick 1.0.8.