Closes #17 by fixing detection of return statements
Reminder comment in test