Cleaning up a little
Include dictionary
Merge pull request #6 from davghouse/develop

Develop