Bug fixes

+ Fixed #62