Fixed issues with complex expressions. #10 and #11

New version 2.3.1 up on NuGet.