4th attempt
Merge pull request #24 from keney17/alpha

4th attempt