Add a todo for future consideration on #349
Merge remote-tracking branch 'origin/master'