Fix various syntax errora and typos
Merge pull request #34 from fahadhatib/develop

Fix various syntax errors and typos