eqr/hadouken — pull request #7 by eqr (2014-10-17 15:54:49+00:00)
Title: update from develop

update from develop