Fork Update 11JUN14

Updating my branch so I can continue working.