Fixed syntax error
Merge branch 'dev-reloc'
Merge pull request #63 from nlanget/master

Merge 2