Fix #13 and #14

Nice, done.