algorithms apr 04
Merge remote-tracking branch 'origin/master'
new code apr 05