Merge pull request #2 from bradbishop/master

introspection parser