#52
.
Fixed #55.
#55.
Merge branches.