Merge pull request #57 from lategoodbye/master

New option for normalized output, new test frames, unit fix