Merge pull request #1 from swapnashettykewill/master

update from source
Merge pull request #2 from swapnashettykewill/master

update from source
fjyjyj
Merge pull request #17 from swapnasatha/master

Changes made by swapnasatha