Issues #99 and #95 . Linkage error or class not found fixed.
Merge branch 'piotrtomiak-master'