Updated accorging to #44 and #66