Kingsley's and Ioana's suggestions
Merge pull request #4 from BladeRunnerJS/ioanaModifications

Kingsley's and Ioana's suggestions