Remove alert
Rules, better functionality
Merge branch 'master' into gh-pages