Merge pull request #1 from hedenberg/master

test