self-RByczko; 2014-02-27 Feb 27; Added quantity and error enhancements