Merge pull request #259 from rth7680/master