Missing commas and little fixes
Merge pull request #48 from Shahor/master

Missing commas and little fixes