initial commit
Merge pull request #1 from jisaw/master

initial commit