Updates
Merge pull request #3 from nielsbuus/updates

Updates