merge with dev
Merge branch 'dev' of github.com:YeoLab/clipper into dev