Allow for `return' in solutions

Signed-off-by: Stephen Celis <stephen@stephencelis.com>