Compiled res based on jeff's changes
Merge pull request #5 from ppinette/master

Compiled res based on jeff's changes