Small changes
Merge pull request #1 from stoyanr/master

Some small changes