Initial commit based on upstream version 1.2.0