Merge pull request #11 from vikinghug/master

Updating to same commits