Clean up
#14 Include recent bug fixes