done
Merge pull request #43 from cleandart/bug_exceptoin

done