version 20130816
cleaning up and tests of connecting the input
TODO branch settings