Had to do some fixing! Version 1.0c