Merge pull request #4 from mplang/master