code
Merge pull request #57 from ssymaster/master

code