update for mzwallace usage
Merge branch 'develop'