working version
Merge branch 'master' of https://github.com/zirbem07/alpha