Merge pull request #17 from curit/dev

Merge dev into master