some updates
some comit
Merge pull request #1 from user223/master

Pull me