Final implementation of Alpha2
Merge branch 'master' of https://github.com/Munken/TripleA