simple webserver
merge from dev