Better arguments handling
Added demo files