Commited after completion of task #71