Changes made by Thomas Birngruber (t.birngruber@aon.at).
Merge branch 'master' of https://github.com/ThomasBB/Joinster.git