Fix #377 thanks to Craig
Merge branch 'master' of ssh://github.com/abarisain/dmix