Merge pull request #1 from lkrenitsky/develop

test again
Merge pull request #2 from lkrenitsky/develop

Sharp pointy teeth!
More cowbell
Merge remote-tracking branch 'upstream/develop' into develop
i haz a flavr