minor changes
removed warnings
Merge branch 'master' into wakes
Removed GCC ignore statement.
Merge branch 'master' into wakes
no deprecated warnings