Brinken/headphones — pull request #2 by Brinken (2012-08-29 11:40:44+00:00)
Title: Develop

Merge Delelope into master