updated prototype/code
Merge branch 'master' of ssh://github.com/ykimbiology/smm-dev