Initial Commit : Working code, API unstable
Merge remote-tracking branch 'github/master'