Merge pull request #61 from hellium/resource_path

Added -R option for resource path
Fix typo in previous commit
Merge pull request #63 from hellium/master

Fix typo in previous commit
Merge remote-tracking branch 'upstream/master' into cmake