Merge pull request #2 from jairofloress/master

20141104
20141104