Merge pull request #39 from ahcorde/master

minor fixes