Merge pull request #3 from jjf28/master

pushing changes from master to development