Merge pull request #1 from web2solutions/master

first pull
Merge pull request #2 from web2solutions/work

Merge pull request #2 from web2solutions/master