Merge pull request #12 from pedroigor/master

Minor improvements.