Added Features

See similarly named commit to Master.