Merge pull request #13 from PhilippSteiner/Alex

Alex