Added Functionality - #27
cleaned up conflict