Fixed #4 and Fixed #5