These changes were moved into the proper files
Fix syntax error
Merge pull request #115 from sorenh/staging

Fix syntax error