Added better cases and renamed npm module