Merge pull request #4 from olerem/master