Removing April Fool's
Merge branch 'devel'