Merge pull request #43 from christianesperar/master

Enhance responsiveness