closes #55
closes #57
Merge branch 'master' into deploy