Merge pull request #2 from truxoft/master

mergin all into v1.0.7