Fixed #3 and Fixed #4