Merge pull request #31 from pmorie/build-images

Build images
Code cleanup / make consistent with README