Devel

#109 
Still need to change the examples