fix bug
Merge branch 'scottDev'