Another adjustments
Merge pull request #22 from chnupal/master

Another adjustments