fixed bug unshifting args
Merge branch 'master' of github.com:DimitarChristoff/epik