Fixed - beta 0.1 version