Updated Support Library.
Initial Functionality for issue #11