Merge pull request #2 from dector/dev

Version 1.0.2