Feature/raw option

One more proposed PR to make library more generic. Also based on #3