Merge pull request #16 from joegallo/master

Two sets of changes