Merge branches 'master' and 'master' of https://github.com/gomsun2/gs2lib