Bug fix and some little adds
Merge pull request #42 from upisfree/synthesis

Bug fix and some little adds