Initial import from version 1.1