Merge pull request #310 from hebbet/patch-1

Thomas B

2015-11-16 0173302ce0826729850daede30c6f7fd87e41846

../../program/resources does not exist in tree 1b50e19e91e579f63b5303e5ee33ba982744f7d3