Fixes #70
Merge branch 'master' of https://github.com/SEP007/lmvc-patat