Fixed #13 Fixed #1