up and running
merge from github