playing with build stuff
fixed wierd segfault
merged master