169e5ac Fixes for #14 & #15.