fixes #7
fixes selection bug
Merge branch 'master' into gh-pages