small updates in relation to https://coderwall.com/p/fgyruq