fixed bug
second bug..
Merge branch 'topic'