close #22
Merge branch 'master' of https://github.com/bmease/ecig