minor edit
merged with master
fixed syntax errors
merged with master