tested isprefix, updated scaffold
Merge branch 'develop'