close #92
Merge pull request #95 from rhsu/issue92

close #92
Merge branch 'master' into subtask
code review