Added warning
Added assumption testing
Improved file naming