Lastest work
Merge pull request #13 from giv2giv/v1

Lastest work