Fix #7
Merge branch 'master' of github.com:C4ptainCrunch/beta402