Merge pull request #114 from ernstchan/master

merge