Merge pull request #15 from tmartin357/master

Fixed #14