Merge branch 'hotfix/nilValues'
Fixed bug where app would crash when scrolling to a viewController when cache was empty
Merge branch 'hotfix/0.1.6.1' into develop