Merge pull request #93 from felipewmartins/master

Set focus on page load
wrapper update
issue #85
Merge pull request #94 from eprogramming/master

issue 85