mattansb Merge pull request #2 from mattansb/dev