Format 2 handled fully
Merge pull request #97 from Ricky1833/master

Format 2 handled fully