adjust to changes in master
Merge pull request #50 from kud1ing/master

Adjust to changes in master