Fix #26 Refactor to facilitate version updates