commit 19.12.2012 alex
Merge pull request #7 from PhilippSteiner/alex

commit 19.12.2012 alex