Development - Merge latest development branch for Issue #22

Updating GEM files.