Fix some syntax from pull request #19. Fixes #22.
Merge pull request #23 from jsmpereira/devel

Fix some syntax from pull request #19. Fixes #22.  -- Merging in, see /devel for result