released ubuntu
reorganized headers
Merge branch 'master' into ubuntu
released