Sprint/1.0.1

All issues addressed, ready for merge