Merge pull request #166 from tillkruess/master

Aleksander Machniak

2014-02-10 e7881f058ae8a006b16f59937bfcf125df5af486

../../program/resources does not exist in tree 7a773d136a29517dce4448f1246f107a8fe320bb