Merge pull request #1 from superness/master

updating