committing for backup
close #192
Merge pull request #193 from rhsu/issue192

Issue192
merge conflicts