initialization refactor
merge with master
lazy focus fixed
tests added
new version
Merge branch 'bugs'