fixed line wrap
implemented parsing
Merge branch 'master' of https://github.com/Thaodan/shpp