update
Merge remote-tracking branch 'upstream/master'
=.=
change while loop
Merge pull request #4 from valdersoul/master

while loop