Merge pull request #6 from pdonadeo/master

Three simple changes