Issue #68, #69, #70, #71.