Added classes and method stubs
Added classes and method stubs
Merge remote-tracking branch 'origin/master'