Close #194
Merge branch 'refs/heads/entwine_develop' into feature/new_design