removed crappy while
Merge origin/master