so many changes :sparkles:
Merge pull request #3 from douggr/master