Resolving issues 1 and 2

@gonfunko 

~requested 320

#1
#2