Initial Stub
Merge pull request #1 from merbla/master

Initial Stub