Some CRUD...
Merge branch 'master' of https://github.com/alfoeternia/ndi2013