Some minor changes fixes
Merge branch 'master' of https://github.com/rhuang/semantix
Merge pull request #15 from dmilisav/master

Some minor changes and bug fixes