Merge pull request #1 from cryptix/master

LGTM! Thanks!