This while loop makes me sad, kill it
Merge pull request #4 from stevommmm/master

Right down the bottom.