Merge pull request #1 from olefredrik/master

Update 08/09/2014