Minor improvements, fixed #19
Further image addition