Closes modulargaming/modulargaming#221