Fixed #6, remove all warnings