SJL-3
Moved other s-expressions detection to check functions
SJL-3
Just fixed everything
master
Merge branch 'SJL-3'