Merge pull request #2 from linuxbbq/master

updating