cleaned but untested
Merge pull request #10 from mightyfrancis/devoffice

cleaned but untested