Merge pull request #65 from martinfrances107/master

#65 by martinfrances107: Fixes WSOD on install