Merge pull request #8 from jabr/master

Assorted features