UPDATE - v.1.4+ for Nocturnal (WP version)