Initial implementation - Still WiP
Merge pull request #4 from nephila/develop

Initial implementation - Still WiP