Fixed #10
More to come.