few code updates
Merge pull request #1 from gr2m/master

few code updates