algorithm v0.2

minor bug fixes
Merge branch 'test-algorithm' into develop