Merge pull request #1 from octoblu/master

updating