integration of scintax
small parser fixes after more testing
Merge pull request #20 from klakplok/master

integration of scintax