Working, needs fix to output format.
Merge pull request #52 from Winston-Chan/nathan

Working, needs fix to output format.