while and tests
Merge pull request #5 from caktux/master

while and tests