Fixes #3 Switch to marked library