Merge pull request #67 from jpnurmi/preset