Merge branch 'master' bugfix into develop
Adapter Patterns
Merge pull request #2 from lockrecv/develop

Merged adapter pattern from branch develop