toolness Merge pull request #2 from toolness/platform-refactoring …