Fixed issue 12

plz approve it