Merge pull request #157 from malcolmsparks/master