closes #54
Merge branch 'master' into deploy