Merge pull request #121 from ncstdc/master