adding latest changes
update
Merge pull request #1 from stoned-code-warrior/v2

V2