Revert "#15 working on default args"

This reverts commit 33a9d5804bf98b288b9b48f2848a989ebeb9e9f4.
#24 revert and fix develop branch