Some bug fixes to checksum calculation
Added some macros
Merge branch 'development'