todo for better error handling
Adding support for mavericks
Supports "%" in calcs.
Removed trailing ;
Merge branch 'mavericks'