Fix for reserved keyword "default"
Merge pull request #696 from nateirwin/master

Fix for reserved keyword "default"