synchronized waveforms
Fixe javadoc comments
Merge branch 'master' into feature/timestampdata