Changes done as suggested at #13