Merge pull request #323 from isp-sns-bskyb/master