Merge pull request #3 from linuxbbq/master

merging