Merge pull request #3 from 1500100900/d2c611f2a7ea395c6f2ff800fcce17fd74045505

More fixes.
Merge remote-tracking branch 'upstream/master'