#Issue 181 checked in