Feature/v1

#88 
#76