Fixed #15 and #16