modified while test
modified while test
Merge branch 'master' of github.com:ty707/SCALR