Fixes for Issues 11, 12, 14 & 15.