Merge pull request #24 from MarathonData/dev

Dev
Revert "Dev"
Merge pull request #25 from MarathonData/revert-24-dev

Revert "Dev"