git issue 23 fixed. issue 22 implemented but untested.