asb Merge pull request #298 from ashleynewson/master …