diff --git a/bin/ans-playbook b/bin/ans-playbook
new file mode 100755
index 0000000000..db75f97bba
--- /dev/null
+++ b/bin/ans-playbook
@@ -0,0 +1,52 @@
+#!/usr/bin/python -tt
+# (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+import ansible.playbook
+from ansible.scripts import base_ans_parser, error_print
+
+def main(args):
+    parser = base_ans_parser(output_path=False)
+    parser.usage = "ans-playbook playbook.yml"
+    options, args = parser.parse_args(args)
+
+    if len(args) == 0:
+       print >> sys.stderr, "playbook path is a required argument"
+       return 1
+
+    for playbook in args:
+        pb = ansible.playbook.PlayBook(
+            playbook=playbook,
+            module_path=options.module_path,
+            remote_user=options.remote_user,
+            forks=options.forks,
+            verbose=True
+        )
+        pb.run()
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))
+
+
+
+
+
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index 594b6f3d3d..11af92e00d 100755
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -24,6 +24,7 @@ import json
 import traceback
 import paramiko # non-core dependency
 import ansible.constants as C 
+import Queue
 
 def _executor_hook(job_queue, result_queue):
     ''' callback used by multiprocessing pool '''
diff --git a/library/command b/library/command
index d1b43c1a11..fbef7944d9 100755
--- a/library/command
+++ b/library/command
@@ -51,6 +51,11 @@ except:
 endd = datetime.datetime.now()
 delta = endd - startd
 
+if out is None:
+   out = ''
+if err is None:
+   err = ''
+
 result = {
    "stdout" : out,
    "stderr" : err,