Fixed #61 Fixed #42