Fixes for: #38, #29, #35, #30, #19
Updates the fix introduced in #5 to be more specific and less of a catch all.
Changed version to v1.1.2