Resolved syntax issues as found in Issue #24