fixed bugs
Merge branch 'angel' of https://github.com/aleksandarmilicevic/react into angel