refactored syntax definition, added support for hashes
Merge branch 'master' of github.com:mculhane/project