Added hack to allow use of eclipse and command line