Merge pull request #1 from z80/master

Pull request 23-10-2013