Fixed bug #40 and improved stroy method behaviour
Fixed