7th attempt
Merge pull request #15 from keney17/alpha

7th attempt