Merge pull request #1 from sandsmark/master