Fix for issue #116 (replaced build files).

Okay, put the build files back in and squashed with my changes, let's hope I did it right this time.

Apologies for all the branches and pull requests now :(