Added basic API Implementation
Merge pull request #1 from bahuma/api

Added basic API Implementation
Merge pull request #2 from bahuma/master

Merge master into dev