Fixed bug
Merge branch 'development' of https://github.com/thejennywang/bunch into development