Merge pull request #248 from flanpy/master

Thomas B.

2014-12-21 8e7ed506c41ea8b8f725f7e122ca6f0b091de5e4

../../program/resources does not exist in tree 3a005041bf1a50adf5aa051976a1477f6833adcb