Fixed minor syntax related issues.
Merge pull request #9 from sam43/dev DEV: Merge the latest changes on devs