Fixed #35 and #36