Restore commented out code
Merge branch 'issue26': Restore some code commented out for testing.