#131: Header updated. Added some documentation