Merge pull request #1 from W4ngatang/master

workk
work on algorithm, updated ui
Merge pull request #4 from Rarlegend/master

algorithm update