Fixed #20.
Merge commit '940dd05787e8c8173dcb391af90cb3851cffa481'