Merge pull request #1 from benfalk/master

merging