Issue #119
Issue #12
Fixed #268