Fixed #11
Deleted wrapper
Added attributions