Two classes to handle it now
Two classes to handle it now
updated version to 0.9.2