Commit 47 (post beta)
Small bug fix (encoding quotes) and unit tests