Fixed #114. Fixed #125. Fixed #126.