Merge pull request #25 from AppGroup/master

change