Merge pull request #1 from AndySomogyi/develop

merged in Totte's frequency analysis