Merge pull request #2 from alicorn/alicorn_

Alicorn