Added trills and ornaments to Simple module, fix #5, fix #6