update
Merge pull request #6 from akaDealloc/master

update