closes #77
Merge branch 'master' into deploy