Commit after completion of task #101 & #80