Merge pull request #2 from pfriedrich/alpha2

Alpha2
Merge pull request #3 from pfriedrich/master

Merge pull request #2 from pfriedrich/alpha2