removed -Wsign-conversion and reran autotools
Merge branches 'dev' and 'master'