Merged upstream + Issue #9