Fixed #4 and #15