Merge pull request #2 from mcmtroffaes/master

Minor fixes.