fixed #126, fixed #127, fixed #129
Merge branch 'edge' into gh-pages