Testing (SS 7 oct 2014)
Merge branch 'master' of https://github.com/PascalSteger/darcoda