fix args parsing
fix position
ooooops!
Merge branch 'refs/heads/master' into sortable-2013

Conflicts:
	style.css