first commit

Pulled github to here
The change was already fixed.
Merge remote-tracking branch 'origin/iss1'