Merge pull request #15 from ObjectiveHAL/develop

Feature/fix order of operations