Merge pull request #2 from mattwaite/master

Adding performance characteristics and system description