Resolves issues #114, #128