Issues/13

#13 
Same comment as above