Implemented methods for #86, #76 already done (closes #76)