Merge pull request #112 from ernstchan/master

merge