Merge pull request #40 from nilrog/upstream

Fixed a syntax error introduced in pull request #33.