Refactored #86 and added here.  Closed #86
Updated CHANGELOG and CONTRIBUTORS