fixes and additional features:
Merge branch 'master' of git://github.com/errant/moxy