Merge pull request #9 from martindale/develop

Major Maki Refactor