Merge pull request #2 from Bigjoos/master

Mass updates from master