Merge pull request #48 from cawaltrip/master

Massive Merge
Fixed a syntax