Merge pull request #157 from dirvine/next

Next