Merge pull request #2 from zsweedyk/Alpha

Alpha
Merge branch 'Alpha'
Last update to the Alpha.