Issues 515

restore the unmerged branch