Responsiveness take-6.
Merge pull request #50 from refocus-studios/pmb-43

Responsiveness take-6.