Add yield recognition and sanitization
Update demo
Add public accessors for private methods for unit testing
Add unit tests for sanitization