5th attempt
Merge pull request #25 from keney17/alpha

5th attempt