Merge branch 'master' of https://github.com/getscatter/scatter-sharp

Author: mmcs85