August 15 2014

Bug fixes and updates