Takes care of issue #76
Merge pull request #99 from JoshuaEstes/Issue76

Takes care of issue #76