A few additions
Merge pull request #47 from domenic/patch-1

A few additions