Add feature functions
Bug fixes
Bug fix