Fixes #2 #14 #19