Implemented #3
Few corrections.