updated for mms support
Merge branch 'master' of https://github.com/jmichala/bearded-octo-robot