Merge branch 'development'. closes #67