Merge fix
Add flashes animations
Merge pull request #14 from avandecreme/master

Update