close #47
Merge branch 'master' of https://github.com/dougestey/elsie