Merge pull request #6 from nrleuenb/master

Pulling to branch NRLeuenb --nrleuenb
Merge pull request #10 from nrleuenb/master

Merge pull request #8 from nrleuenb/master
Merge pull request #11 from nrleuenb/NRLeuenb

Merge Pull Request #11 -- master up to speed