#31 build changes