Merge pull request #59 from mabalaski/master

Looks amazing