Fixes argument counting, refactors Arguments
Version to 0.3.1