Initial implementation
Merge pull request #1 from grm84/master

Initial implementation