2 files changed, 11 insertions, 8 deletions
diff --git a/bin/asciidoctor b/bin/asciidoctor
index 2b112173..ee394296 100755
--- a/bin/asciidoctor
+++ b/bin/asciidoctor
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'rubygems' if RUBY_VERSION < '1.9'
+require 'rubygems' unless defined? Gem
 
-if File.exist?(app_lib_path = (File.expand_path '../../lib/asciidoctor', __FILE__))
-  require app_lib_path
+if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+  require asciidoctor
 else
   require 'asciidoctor'
 end
diff --git a/bin/asciidoctor-safe b/bin/asciidoctor-safe
index 516f51b1..9a70f233 100755
--- a/bin/asciidoctor-safe
+++ b/bin/asciidoctor-safe
@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
 
-require 'rubygems' if RUBY_VERSION < '1.9'
+require 'rubygems' unless defined? Gem
 
-require File.join File.dirname(__FILE__), '../lib/asciidoctor'
+if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+  require asciidoctor
+else
+  require 'asciidoctor'
+end
 require 'asciidoctor/cli'
 
-options = Asciidoctor::Cli::Options.parse! ARGV
-options[:safe] = Asciidoctor::SafeMode::SAFE
-invoker = Asciidoctor::Cli::Invoker.new options
+invoker = Asciidoctor::Cli::Invoker.new(ARGV + ['-S', 'safe'])
+GC.start
 invoker.invoke!
 exit invoker.code