Merge pull request #473 from grimreaper/master