Merge pull request #4 from Devahoy/master

merge from part1