Fixed #151 by using foldername of pic instead of dimension
Merge branch 'bugfix/151' into develop