Fixed github issues 1 and 2.