Updated
Merge pull request #7 from kiyanwang/master

Updated, to indicate I'll be attending