Closes modulargaming/modulargaming#207
Merge branch 'develop'