PR of initial master commits

Consider using optval module here ;-) 

https://www.npmjs.org/package/optval