Added support for running from either eclipse or jar