Small changes
Merge pull request #153 from nanduni-nin/master

Small changes