Merge PR #578 #579