Updated with changes in Issue 30

Issue 30 - Added support for calc(), attr() and toggle() functions, and
new units