Slight refactor and use promises correctly
Release 0.0.4
Merge branch '0.0.4'