Merge pull request #2 from pblottiere/master

minor fixes