allow installation as console script
fixing merge conflicts