Commit references issues #9, #25, #26