Merge pull request #10 from ObjectiveHAL/master

Master
Merge pull request #11 from ObjectiveHAL/develop

Merge pull request #10 from ObjectiveHAL/master