Added basic stand-alone tool