Merge pull request #1 from sharpobject/master

Source code update