Fixed #26 and #28.