#22 - Fixed the linking issues under Linux