Merge branch 'master' of https://github.com/a64adam/ASC.git