Modified configure, added some files
Changing to develop branch