Fixed issued #1 and #2