Fix for Issue #3

Also adding missing classes PCode and PCodeCollection