Merge PR 26 into develop