closes #66
closes #65
Merge branch 'master' of github.com:beak-lab/swell
closes #68