Initial implementation
Merge pull request #1 from thaiphan/dev

Initial implementation