solved issues #1 & #2