Merge pull request #7 from tobmaster/master

Update
merged