Updates
Merge pull request #1 from war1025/dev/updates

Updates