updates
Merge pull request #50 from jvcasill/master

updates