modifications to adapt to new formats
Merge pull request #21 from jensopetersen/master

modifications to adapt to new formats