Merge pull request #2 from nikogu/master

Auto merge by kpm server