Merging fixes for #3 and #4