Merge pull request #2 from pfriedrich/alpha2

Alpha2