Adress #FS 1143 & #FS 1311 and other improvements
Add Waves period information (#FS 1306)
Merge pull request #91 from Ptizef/master

Adress #FS 1143 & #FS 1311 and other improvements