Fixed bugs

Fixed #68