* fixed sorting issue
Merge branches 'gh-pages' and 'master'