Revert to working issue 38 due to failed merging