fixed merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from nvk/master

fix merge