part of the fix for #102
Merge branch 'master' of https://github.com/limpkin/mooltipass