Added and updated files
Merge pull request #1 from phynam/development

Added and updated files