misc fixes
Merge pull request #2 from pgodel/master

misc fixes