Merge pull request #25 from FiatInsight/master

Merge