Added fixes for github issues 1 and 2