Compile error
Merge pull request #304 from jaredbischof/master

Compile error