push to gh-page
merged latest master changes
code reorganization