Merge pull request #16 from hazendaz/master

Bringing Velocity-scripting up to date