Implemented capacity member functions
Merged branch 'master ' of remote master