Merge pull request #7 from stassats/master