Update

Change-Id: I32d1a9fa054841c02f62c6a9ee1aa57d00d83be6
Signed-off-by: Noah Goldsmith <Planetaryn@gmail.com>
Merge pull request #3 from Planetaryn/master

Update