resolve 43 and some work on responsiveness
Merge pull request #45 from CharlesGust/43

resolve 43 and some work on responsiveness