Merge tag '2.1.3' into develop

Version 2.1.3

Bug fixes.
Check for the index before accessing it.
Bumped version to 2.1.4.rc1
Merge branch 'feature/undefined-index-item' into develop. Fixes #17
2.1.4
Merge branch 'release/2.1.4'