Small changes
Merge pull request #32 from sinak/master

Small changes