MORE EXCEPTION
Merge pull request #11 from WenyingLiu/master

MORE EXCEPTION