Commit after completing task #100, #87