Changes #319
Implemented #320
Changes #322