fixes
Merge pull request #19 from jcmrgo/master

fixes