fixed setup
merge with jalad/master