Fixed #2
Fixed #3
Fixed #5
Merge branch 'master' of https://github.com/emmanuelluna/PearlBee