Bug fix for issue #39.
Added Autoshun and ISC checks, fixed issue #37