Merge branch 'master' of https://github.com/araog/amss.git

fghjkl;'