Updates
Merge pull request #5 from hjelmn/master

Updates