Revert "Revert "Merge pull request #51 from tstephen/master""

This reverts commit cf6b5b9bf7b72c749146056c6d4269ac9fef81d9.
Revert "Merge pull request #56 from vbonamy/ROO-241"

This reverts commit 423b03c82d15d72c78f5b8f6f49d41c8b0841ec9, reversing
changes made to e55c99dd8d4be6fe8fc2178161c7dbb0435914ed.