Added test, code for v0.1 release
Handle args when not required.