Pull issue 21 fix into master