Added more options / resolves #19
Updated changelog and manual
Updated branch-alias