Added stub classes to keep backward compatibility
Fixes to code style
Annotations to mark stub classes as deprecated
Merge pull request #197 from vladimmi/master

Added stub classes to keep backward compatibility