Merge pull request #9 from curit/dev

pull into master