Merge pull request #4 from Devahoy/master

merge from part1
Merge pull request #5 from Devahoy/part1

Merge pull request #4 from Devahoy/master