allow custom id separator
fix attribute error
catch KeyError
Merge branch 'master' into python27