add fixes
Merge pull request #5 from mgiustiniani/1.0

add fixes