Fixing minor issues from previous versions
Merge pull request #1 from zmashiah/InitialVersion

Fixing minor issues from previous versions