Merge pull request #15 from s0600204/office