fix last merge + make period optional
Merge pull request #163 from MichaelKohler/fixmerge

fix last merge + make period optional