committing for backup
Merge pull request #141 from rhsu/test

committing for backup
Merge branch 'dev'