Fixed #622
Updated changelog