Merge pull request #2 from AnthonyDiGirolamo/master

pull newest changes