Merge pull request #50 from olerem/testing