fixed #2
new #1