Fixed bug #9, added headers