Fixed #4 and Added #2