Fix for issue #299.

I've added braces and targeted the ```develop``` branch now, as you requested.