Incorporated review comments

Used a different branch because of the rebase.  For issue AlekSi/gonuts.io#23