Merge pull request #2 from truxoft/master

mergin all into v1.0.7
Merge pull request #3 from truxoft/working

Merge pull request #2 from truxoft/master