Merge pull request #38 from olerem/next