implement algorithm
fix website
Merge branch 'implement-algorithm' into develop