Merge pull request #243 from bnogas/master-p6

Aleksander Machniak

2014-10-30 a075df6f086656f9a01f0023111be6eb83c9d0db

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