Update
Merge pull request #8 from SEI2014-UnirSM/master

Update