Merge branch 'master' into ws-direct
Added borders, small bug fixes
Merge branch 'master' into ws-direct
Merge branch 'ws-direct' into gh-pages