Improved argument support, issue #13.