Merge pull request #14 from jankner/1.x

1.x
Merge branch '1.x' of https://github.com/emilaxelsson/syntactic into 1.x