Manual merge to close #186
Fix merge