Merge pull request #9 from cjc061000/master

pull request 11 02 2014 terminado sprint 2