Minor corrections

Minor corrections
Merge pull request #3 from vassilisb/master

Minor corrections