Merge pull request #311 from naedanger/master