Added Bitmask support
Added h- and cpp-files
Merge...