new version; better injection handling; added tutorial