update of shortcode class

Also there are a few readme.md changes