Fixed Bugs #134, #135, #142, #143