Version 0.0.14

Changes from meeting with Keith