Merged BJ's code into CMS parser lib and added simple test