Merge pull request #3 from drasticactions/master

Updating against master.
Merge pull request #4 from drasticactions/master

Updating fork
Merge pull request #5 from drasticactions/master

Rebasing code
Added promo images
Merge pull request #16 from KitF/master

Added promo images