first commit
Merge https://github.com/geoffbalasi/alpha