Merge pull request #2 from hannorein/master

Failsafe
Merge branch 'eric'