Updated to most recent development files
Merge pull request #1 from frozenshadow/develop

Updated to most recent development files