Builds commits 49a5648
 and ef349ea
. Fixes issue #39