Merge pull request #1 from ubc/master

updating to master
fixing 'error' attribute on shortcode
Merge pull request #6 from jhnbrnn/master

fixed usage of 'error' attribute in shortcode