Fix (hopefully) final bug!
Merge branch 'master' of https://github.com/linuxuser0/capuchin