fixed fixes
Merge pull request #12 from fponticelli/master

fixed fixes