Added library option - closes #4