Upgrading to release 2.1 and 2.2.
Merge pull request #6 from ljo/master

Upgrading to release 2.1 and 2.2.
errors pointed out by Jean-Baptiste Pressac in http://markmail.org/message/iygk44hbpf2jsec2
minor edits.
Merge pull request #11 from jensopetersen/master

errors pointed out by Jean-Baptiste Pressac in http://markmail.org/messa...
namespace declarations are not attributes
getting the grammar right …
Merge pull request #13 from jensopetersen/master

namespace declarations are not attributes