added two directions
Merge branch 'dev' into gh-pages