seankross Merge pull request #41 from swirldev/dev