Merge pull request #301 from hsz/master

Aleksander Machniak

2015-10-08 4d369549bd677b6e6b5ee2ef8dea227faded005d

../../program/resources does not exist in tree a28edbc64f77e09903df01ada31aeefc034e633d