1d31a82 Merge branch 'master' of https://github.com/nksm/nksm.github.com