- merged makefile from master and images from wiki branch