Merge pull request #7 from Ramblurr/master