Merge pull request #35 from sethwoodworth/devel