More updates
Merge pull request #6 from Dapperbot/more-updates

More updates