Added important features

See commit log