Add support for custom arguments (fix #3)