updates
updates, ./configure works, however make does not
updates
updates
Merge branch 'dev'