Added fixes for #53