initial commit
Merge remote-tracking branch 'github_ribbit/master'