Merged correct bitwise function.  New makefile