Merge pull request #1 from muelli/master

Update 12/08/14