- Fixed issue #332
- Fixed issue #331
Merge remote-tracking branch 'upstream/master'