minor
Merge branch 'master' of https://github.com/gully/SSC383D

have to fetch from master first