some fixes
more fixes
Merge pull request #26 from spderosso/master

some fixes