Merge pull request #1 from Quadrophone/master

pull