Merge pull request #1 from nikogu/master

Auto merge by kpm server