Merge https://github.com/sciencehackday/sf-2013/pull/2