Implemented #56
Fixed bug #124