v1.0

debugged and added some minor enhancements