finally
Merge pull request #14 from PhilippSteiner/Alex

finally