Fixed Bug #4 and changed version