Merge pull request #11 from nrleuenb/NRLeuenb

Merge Pull Request #11 -- master up to speed