Merge pull request #1 from zkinfo/master

first commit