SOS Functionality Merge

This fix addresses Issue #24 and Issue #15 .