Merge pull request #258 from john-connor/master