minor improvements
Merge pull request #1 from manelvf/master

merged pull #1