Args

Added args as discussed in #1.