close issue #26

Pleas verify that everything is working properly.