Updated Merge of #25 Against Master