implements issue #8 and #9 fixed bug with token parser
Merge branch 'project-template' into develop