20140918fixed
Merge branch 'dev' into gh-pages