Fix
Fix
Close #4
Merge branch 'master' into visualization