Merge changes from Nii repository
Merge branch 'master' of https://github.com/newicon/nii-core