Update from mrjuliuss/syntara
Merge pull request #1 from anhsaker/master

Update from mrjuliuss/syntara