Some changes
Merge pull request #1 from bjggi/updates

Some changes